From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 9 May 2016 14:32:29 +0000 (+0200)
Subject: Merge tag 'reset-for-4.7-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~2309^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1644de03cbc05b70d0283c570b75fe9339b375b7;p=linux-4.9.git

Merge tag 'reset-for-4.7-2' of git://git.pengutronix.de/git/pza/linux into next/drivers

Merge "Reset controller changes for v4.7" from Philipp Zabel:

- add missing stub for device_reset
- add support for OXNAS SoCs

* tag 'reset-for-4.7-2' of git://git.pengutronix.de/git/pza/linux:
  reset: Add missing function stub for device_reset
  dt-bindings: Add Oxford Semiconductor Reset Controller bindings
  reset: Add Oxford Semiconductor Reset Controller driver
---

1644de03cbc05b70d0283c570b75fe9339b375b7